<html>
<head><meta charset="utf-8"><title>merge conflicts · t-compiler/help · Zulip Chat Archive</title></head>
<h2>Stream: <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/index.html">t-compiler/help</a></h2>
<h3>Topic: <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/merge.20conflicts.html">merge conflicts</a></h3>

<hr>

<base href="https://rust-lang.zulipchat.com">

<head><link href="https://rust-lang.github.io/zulip_archive/style.css" rel="stylesheet"></head>

<a name="199415085"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/merge%20conflicts/near/199415085" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Noah Lev <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/merge.20conflicts.html#199415085">(Jun 01 2020 at 19:56)</a>:</h4>
<p>How does Rust avoid constant merge conflicts? E.g., I know there's an ongoing effort to split up <code>astconv.rs</code> (<a href="https://github.com/rust-lang/rust/issues/67418">#67418</a>), yet people are still contributing to the file. On my own projects, I have multiple branches for different features and I relatively often get merge conflicts, or even worse, Git auto-merges and messes something up.</p>
<p>Are there special tricks that are used to ensure that changes merge smoothly?</p>



<a name="199416954"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/merge%20conflicts/near/199416954" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Jonas Schievink  [he/him] <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/merge.20conflicts.html#199416954">(Jun 01 2020 at 20:14)</a>:</h4>
<p>Relative to its size, the code base changes relatively slowly, so conflicts aren't usually that much of a problem</p>



<a name="199417327"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/merge%20conflicts/near/199417327" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Noah Lev <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/merge.20conflicts.html#199417327">(Jun 01 2020 at 20:17)</a>:</h4>
<p>Hmm. So you're saying that there aren't too many conflicting changes that are about to be merged at any one time? I guess rebasing is just the solution</p>



<a name="199418074"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/merge%20conflicts/near/199418074" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Jonas Schievink  [he/him] <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/merge.20conflicts.html#199418074">(Jun 01 2020 at 20:24)</a>:</h4>
<p>Yeah, for PRs for splitting up astconv I'd expect some amount of conflicts. We don't have any special solution for that.</p>



<a name="199419095"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/merge%20conflicts/near/199419095" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> mark-i-m <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/merge.20conflicts.html#199419095">(Jun 01 2020 at 20:32)</a>:</h4>
<p>I will say that if you are doing a large refactor (e.g. touching a whole <code>rustc_*</code> crate or multiple crates, you should expect to rebase a few times...</p>



<hr><p>Last updated: Aug 07 2021 at 22:04 UTC</p>
</html>